Skip to content

Sync with upstream @ 405150f1#78

Closed
javascript-translate-bot wants to merge 97 commits intomasterfrom
sync-405150f1
Closed

Sync with upstream @ 405150f1#78
javascript-translate-bot wants to merge 97 commits intomasterfrom
sync-405150f1

Conversation

@javascript-translate-bot

This PR was automatically generated to merge changes from en.javascript.info at 405150f

Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.

Alternatively, you can close this PR and merge conflicting changes manually.

The following files have conflicts and may need updates of the translations:

To merge changes manually (instead of merging this PR):

  1. Add remote upstream that links to the English version (only needs to be done once)
    • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
  2. Commit all current work locally and git checkout master
  3. Pull the recent changes from the English version:
    • git pull upstream master
  4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
    • Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
      • git checkout --ours <path>
    • See the diff, what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
    • Then you can examine the changes in upstream and add them manually
  5. When conflicts resolved, commit them and git push origin master

This PR will be closed and replaced with a new one in a few days.

baooab and others added 30 commits January 20, 2020 15:34
As threatened, change line 34, "to summarize: ..." 

Also add "these" before "internal properties".
Removed extraneous quote mark I had accidentally inserted.
Small punctuation change. 

Separately, I didn't change anything on this today, but note that line 34 above:
"So to summarize: the executor runs automatically and attempts to perform a job. When it is finished with the attempt it calls `resolve` if it was successful or `reject` if there was an error."
was, before it was changed recently, pretty much the same as line 82 above:
"To summarize, the executor should perform a job (usually something that takes time) and then call `resolve` or `reject` to change the state of the corresponding promise object."
So maybe some revision there is in order -- to not have both, or to change one or both. Not familiar enough with the article at this point to make the revision.
Corrected grammatical errors.
Check if `pattern:Y` is immediately after `pattern:X`  and then the regex will check if Z is immediately after Y,  Like this it's more understandable.
Change "occasional" to "accidental". I think that's what you mean, and the words are not synonymous in English.
"continues to closest" -> "continues to next closest". Consistent w/ usage in rest of explanation.
A minor typo issue : polywill -> polyfill
Fix typo in 11-coordinates/article.md
"allows to use" -> "allows us to use"
"to use with await" -> "to use it with await"
A few syntactic and punctuation changes to 'The “try…catch” syntax' section.
"can use" -> "we can use".
Maybe clarifying a bit where `.json()` comes from. I personally found it a bit confusing at first.
"We can get loop over values by `for..of`:" -> "We can loop over their values using `for..of`"
paroche and others added 26 commits February 13, 2020 21:49
"get in details" -> "get in to the details"
"if arguments count" -> "if the arguments count"
"allows to easily" -> "allows us to easily"
"seen in the logging example:" -> "seen in the logging example,"
rephrasing rest of above sentence for readability
…ale counterparts and rounded up for easy comprehension.
Gender pay gap noticed in recursion article.md
Remove unnecessary return in couple of examples
Mac OS multiline Commenting shortcut is should use 'Option' instead o…
Fix minor typo error of 1-js/06-advanced-functions/03-closure/article.md
@claassistantio
Copy link

claassistantio commented Feb 24, 2020

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 18 committers have signed the CLA.

✅ iliakan
✅ Violet-Bora-Lee
✅ u-n-known
✅ KennethKinLum
✅ leviding
❌ baooab
❌ zeel
❌ Beginnerds
❌ paroche
❌ lex111
❌ hongsidev
❌ sohailashraf003
❌ nishantsinghcs
❌ cycduck
❌ rizkyzhang
❌ achianumba
❌ nekhaevskiy
❌ bibin765
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.